From f05f0377df567fc3d0211d4385b90dd1c951d9aa Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 1 Jan 2017 23:47:53 +0100 Subject: [PATCH] vulkan: Modernize blend pipeline - Rename from blit => blend - Use instances - Add clip versions --- gsk/gskvulkanblendpipeline.c | 48 +++++++-------- gsk/gskvulkanrender.c | 4 +- gsk/gskvulkanrenderpass.c | 22 +++++-- gsk/gskvulkanrenderprivate.h | 4 +- .../vulkan/blend-clip-rounded.frag.glsl | 57 ++++++++++++++++++ .../vulkan/blend-clip-rounded.frag.spv | Bin 0 -> 5180 bytes .../vulkan/blend-clip-rounded.vert.glsl | 53 ++++++++++++++++ .../vulkan/blend-clip-rounded.vert.spv | Bin 0 -> 4940 bytes .../{blit.frag.glsl => blend-clip.frag.glsl} | 2 +- .../{blit.frag.spv => blend-clip.frag.spv} | Bin gsk/resources/vulkan/blend-clip.vert.glsl | 46 ++++++++++++++ gsk/resources/vulkan/blend-clip.vert.spv | Bin 0 -> 4604 bytes gsk/resources/vulkan/blend.frag.glsl | 12 ++++ gsk/resources/vulkan/blend.frag.spv | Bin 0 -> 632 bytes gsk/resources/vulkan/blend.vert.glsl | 31 ++++++++++ gsk/resources/vulkan/blend.vert.spv | Bin 0 -> 1964 bytes gsk/resources/vulkan/blit.vert.glsl | 22 ------- gsk/resources/vulkan/blit.vert.spv | Bin 1252 -> 0 bytes 18 files changed, 247 insertions(+), 54 deletions(-) create mode 100644 gsk/resources/vulkan/blend-clip-rounded.frag.glsl create mode 100644 gsk/resources/vulkan/blend-clip-rounded.frag.spv create mode 100644 gsk/resources/vulkan/blend-clip-rounded.vert.glsl create mode 100644 gsk/resources/vulkan/blend-clip-rounded.vert.spv rename gsk/resources/vulkan/{blit.frag.glsl => blend-clip.frag.glsl} (79%) rename gsk/resources/vulkan/{blit.frag.spv => blend-clip.frag.spv} (100%) create mode 100644 gsk/resources/vulkan/blend-clip.vert.glsl create mode 100644 gsk/resources/vulkan/blend-clip.vert.spv create mode 100644 gsk/resources/vulkan/blend.frag.glsl create mode 100644 gsk/resources/vulkan/blend.frag.spv create mode 100644 gsk/resources/vulkan/blend.vert.glsl create mode 100644 gsk/resources/vulkan/blend.vert.spv delete mode 100644 gsk/resources/vulkan/blit.vert.glsl delete mode 100644 gsk/resources/vulkan/blit.vert.spv diff --git a/gsk/gskvulkanblendpipeline.c b/gsk/gskvulkanblendpipeline.c index 59dd971f16..8a98fbcf83 100644 --- a/gsk/gskvulkanblendpipeline.c +++ b/gsk/gskvulkanblendpipeline.c @@ -7,14 +7,12 @@ struct _GskVulkanBlendPipeline GObject parent_instance; }; -typedef struct _GskVulkanVertex GskVulkanVertex; +typedef struct _GskVulkanBlendInstance GskVulkanBlendInstance; -struct _GskVulkanVertex +struct _GskVulkanBlendInstance { - float x; - float y; - float tex_x; - float tex_y; + float rect[4]; + float tex_rect[4]; }; G_DEFINE_TYPE (GskVulkanBlendPipeline, gsk_vulkan_blend_pipeline, GSK_TYPE_VULKAN_PIPELINE) @@ -25,22 +23,22 @@ gsk_vulkan_blend_pipeline_get_input_state_create_info (GskVulkanPipeline *self) static const VkVertexInputBindingDescription vertexBindingDescriptions[] = { { .binding = 0, - .stride = 4 * sizeof (float), - .inputRate = VK_VERTEX_INPUT_RATE_VERTEX + .stride = sizeof (GskVulkanBlendInstance), + .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE } }; static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = { { .location = 0, .binding = 0, - .format = VK_FORMAT_R32G32_SFLOAT, - .offset = 0, + .format = VK_FORMAT_R32G32B32A32_SFLOAT, + .offset = G_STRUCT_OFFSET (GskVulkanBlendInstance, rect), }, { .location = 1, .binding = 0, - .format = VK_FORMAT_R32G32_SFLOAT, - .offset = 2 * sizeof (float), + .format = VK_FORMAT_R32G32B32A32_SFLOAT, + .offset = G_STRUCT_OFFSET (GskVulkanBlendInstance, tex_rect), } }; static const VkPipelineVertexInputStateCreateInfo info = { @@ -88,7 +86,7 @@ gsk_vulkan_blend_pipeline_new (GskVulkanPipelineLayout *layout, gsize gsk_vulkan_blend_pipeline_count_vertex_data (GskVulkanBlendPipeline *pipeline) { - return sizeof (GskVulkanVertex) * 6; + return sizeof (GskVulkanBlendInstance); } void @@ -96,14 +94,16 @@ gsk_vulkan_blend_pipeline_collect_vertex_data (GskVulkanBlendPipeline *pipeline, guchar *data, const graphene_rect_t *rect) { - GskVulkanVertex *vertices = (GskVulkanVertex *) data; - - vertices[0] = (GskVulkanVertex) { rect->origin.x, rect->origin.y, 0.0, 0.0 }; - vertices[1] = (GskVulkanVertex) { rect->origin.x + rect->size.width, rect->origin.y, 1.0, 0.0 }; - vertices[2] = (GskVulkanVertex) { rect->origin.x, rect->origin.y + rect->size.height, 0.0, 1.0 }; - vertices[3] = (GskVulkanVertex) { rect->origin.x, rect->origin.y + rect->size.height, 0.0, 1.0 }; - vertices[4] = (GskVulkanVertex) { rect->origin.x + rect->size.width, rect->origin.y, 1.0, 0.0 }; - vertices[5] = (GskVulkanVertex) { rect->origin.x + rect->size.width, rect->origin.y + rect->size.height, 1.0, 1.0 }; + GskVulkanBlendInstance *instance = (GskVulkanBlendInstance *) data; + + instance->rect[0] = rect->origin.x; + instance->rect[1] = rect->origin.y; + instance->rect[2] = rect->size.width; + instance->rect[3] = rect->size.height; + instance->tex_rect[0] = 0.0; + instance->tex_rect[1] = 0.0; + instance->tex_rect[2] = 1.0; + instance->tex_rect[3] = 1.0; } gsize @@ -113,8 +113,8 @@ gsk_vulkan_blend_pipeline_draw (GskVulkanBlendPipeline *pipeline, gsize n_commands) { vkCmdDraw (command_buffer, - n_commands * 6, 1, - offset, 0); + 6, n_commands, + 0, offset); - return n_commands * 6; + return n_commands; } diff --git a/gsk/gskvulkanrender.c b/gsk/gskvulkanrender.c index 35e2dce295..1a4a86ae0f 100644 --- a/gsk/gskvulkanrender.c +++ b/gsk/gskvulkanrender.c @@ -314,7 +314,9 @@ gsk_vulkan_render_get_pipeline (GskVulkanRender *self, const char *name; GskVulkanPipeline * (* create_func) (GskVulkanPipelineLayout *layout, const char *name, VkRenderPass render_pass); } pipeline_info[GSK_VULKAN_N_PIPELINES] = { - { "blit", gsk_vulkan_blend_pipeline_new }, + { "blend", gsk_vulkan_blend_pipeline_new }, + { "blend-clip", gsk_vulkan_blend_pipeline_new }, + { "blend-clip-rounded", gsk_vulkan_blend_pipeline_new }, { "color", gsk_vulkan_color_pipeline_new }, { "color-clip", gsk_vulkan_color_pipeline_new }, { "color-clip-rounded", gsk_vulkan_color_pipeline_new }, diff --git a/gsk/gskvulkanrenderpass.c b/gsk/gskvulkanrenderpass.c index 68b9e48dc7..c500d908cc 100644 --- a/gsk/gskvulkanrenderpass.c +++ b/gsk/gskvulkanrenderpass.c @@ -122,18 +122,30 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass *self, case GSK_CAIRO_NODE: if (gsk_cairo_node_get_surface (node) == NULL) return; - if (!gsk_vulkan_clip_contains_rect (&constants->clip, &node->bounds)) + if (gsk_vulkan_clip_contains_rect (&constants->clip, &node->bounds)) + pipeline_type = GSK_VULKAN_PIPELINE_BLEND; + else if (constants->clip.type == GSK_VULKAN_CLIP_RECT) + pipeline_type = GSK_VULKAN_PIPELINE_BLEND_CLIP; + else if (constants->clip.type == GSK_VULKAN_CLIP_ROUNDED_CIRCULAR) + pipeline_type = GSK_VULKAN_PIPELINE_BLEND_CLIP_ROUNDED; + else FALLBACK ("Cairo nodes can't deal with clip type %u\n", constants->clip.type); op.type = GSK_VULKAN_OP_SURFACE; - op.render.pipeline = gsk_vulkan_render_get_pipeline (render, GSK_VULKAN_PIPELINE_BLIT); + op.render.pipeline = gsk_vulkan_render_get_pipeline (render, pipeline_type); g_array_append_val (self->render_ops, op); return; case GSK_TEXTURE_NODE: - if (!gsk_vulkan_clip_contains_rect (&constants->clip, &node->bounds)) + if (gsk_vulkan_clip_contains_rect (&constants->clip, &node->bounds)) + pipeline_type = GSK_VULKAN_PIPELINE_BLEND; + else if (constants->clip.type == GSK_VULKAN_CLIP_RECT) + pipeline_type = GSK_VULKAN_PIPELINE_BLEND_CLIP; + else if (constants->clip.type == GSK_VULKAN_CLIP_ROUNDED_CIRCULAR) + pipeline_type = GSK_VULKAN_PIPELINE_BLEND_CLIP_ROUNDED; + else FALLBACK ("Texture nodes can't deal with clip type %u\n", constants->clip.type); op.type = GSK_VULKAN_OP_TEXTURE; - op.render.pipeline = gsk_vulkan_render_get_pipeline (render, GSK_VULKAN_PIPELINE_BLIT); + op.render.pipeline = gsk_vulkan_render_get_pipeline (render, pipeline_type); g_array_append_val (self->render_ops, op); return; @@ -292,7 +304,7 @@ fallback: g_assert_not_reached (); return; } - op.render.pipeline = gsk_vulkan_render_get_pipeline (render, GSK_VULKAN_PIPELINE_BLIT); + op.render.pipeline = gsk_vulkan_render_get_pipeline (render, GSK_VULKAN_PIPELINE_BLEND); g_array_append_val (self->render_ops, op); } #undef FALLBACK diff --git a/gsk/gskvulkanrenderprivate.h b/gsk/gskvulkanrenderprivate.h index cffce7f0c5..6bfb8b0573 100644 --- a/gsk/gskvulkanrenderprivate.h +++ b/gsk/gskvulkanrenderprivate.h @@ -10,7 +10,9 @@ G_BEGIN_DECLS typedef enum { - GSK_VULKAN_PIPELINE_BLIT, + GSK_VULKAN_PIPELINE_BLEND, + GSK_VULKAN_PIPELINE_BLEND_CLIP, + GSK_VULKAN_PIPELINE_BLEND_CLIP_ROUNDED, GSK_VULKAN_PIPELINE_COLOR, GSK_VULKAN_PIPELINE_COLOR_CLIP, GSK_VULKAN_PIPELINE_COLOR_CLIP_ROUNDED, diff --git a/gsk/resources/vulkan/blend-clip-rounded.frag.glsl b/gsk/resources/vulkan/blend-clip-rounded.frag.glsl new file mode 100644 index 0000000000..fb1c14808c --- /dev/null +++ b/gsk/resources/vulkan/blend-clip-rounded.frag.glsl @@ -0,0 +1,57 @@ +#version 420 core + +struct RoundedRect { + vec4 bounds; + vec4 corners; +}; + +layout(location = 0) in vec2 inPos; +layout(location = 1) in vec2 inTexCoord; +layout(location = 2) in flat vec4 inClipBounds; +layout(location = 3) in flat vec4 inClipWidths; + +layout(set = 0, binding = 0) uniform sampler2D inTexture; + +layout(location = 0) out vec4 color; + +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +float clip(vec2 pos, RoundedRect r) { + vec2 ref_tl = r.bounds.xy + vec2( r.corners.x, r.corners.x); + vec2 ref_tr = r.bounds.zy + vec2(-r.corners.y, r.corners.y); + vec2 ref_br = r.bounds.zw + vec2(-r.corners.z, -r.corners.z); + vec2 ref_bl = r.bounds.xw + vec2( r.corners.w, -r.corners.w); + + float d_tl = distance(pos, ref_tl); + float d_tr = distance(pos, ref_tr); + float d_br = distance(pos, ref_br); + float d_bl = distance(pos, ref_bl); + + float pixels_per_fragment = length(fwidth(pos.xy)); + float nudge = 0.5 * pixels_per_fragment; + vec4 distances = vec4(d_tl, d_tr, d_br, d_bl) - r.corners + nudge; + + bvec4 is_out = bvec4(pos.x < ref_tl.x && pos.y < ref_tl.y, + pos.x > ref_tr.x && pos.y < ref_tr.y, + pos.x > ref_br.x && pos.y > ref_br.y, + pos.x < ref_bl.x && pos.y > ref_bl.y); + + float distance_from_border = dot(vec4(is_out), + max(vec4(0.0, 0.0, 0.0, 0.0), distances)); + + // Move the distance back into pixels. + distance_from_border /= pixels_per_fragment; + // Apply a more gradual fade out to transparent. + //distance_from_border -= 0.5; + + return 1.0 - smoothstep(0.0, 1.0, distance_from_border); +} + +void main() +{ + RoundedRect r = RoundedRect(vec4(inClipBounds.xy, inClipBounds.xy + inClipBounds.zw), inClipWidths); + + color = texture (inTexture, inTexCoord) * clip (inPos, r); +} diff --git a/gsk/resources/vulkan/blend-clip-rounded.frag.spv b/gsk/resources/vulkan/blend-clip-rounded.frag.spv new file mode 100644 index 0000000000000000000000000000000000000000..aa407c2d1bdd84e1c9bce556022ab5322e483643 GIT binary patch literal 5180 zcmZvfhjUa_6o(&%AWBs11xr9hEJRVPQ4tZ>5)FbH6?ILr8(a;$ad(4Q!QQd=u2`^_ z8GG-&_y5DO%;@-iyYDz}cDT&p{?6~Td(OM>Ewrt%?V3q4hCkzz-;(B9KUo7kNhT!Y z8hfs1K~Gn$Ug(;+=Wcqeo3u3?^;s`jI~mKaEbcFrHN1j+hKf!e5$ zBr8cUmiSyxKG)lu>zSJ$92v>i>gNm>^TVZbF<&TEi-YyjlA?a&Gk&G=;P7Z6>(Guz z_6+SwJDHPYer2>=C>G|Ehi;l2bTS}cOaABVWw25$7ppbAI_L|1xHK|t$o+!;5;_j*U8z2h>gLmb zAob6o7aGw`|0A2a=^OFA4c+LbzM!cSt-fZ`$39Y8S{$zBM~c<_P_=*2;$peph+T-S zJX%=9c+uOFJbR&3tM``&i;Sk>;{z?#@|DrL`uJpJ#)oW`#rc6swNOm!wIphK9$OFb1Kwr z#(m%5<}v-I{sa3+f3<&cs{fSHb37l<ow9>YEh>`c^+I~ifk+6b>R0ru_%7u&n%^jTX+KH?q)yF!1g zp)H@a3!e7#IHFHh!nO)t|EyT&WjN1ne0QpQhvY){-l*&U3A??7zxt;sw>j)*V0+X* zyF#Bt^ye7#Gv61flbrR`y@xLCU$YzQEVQe859LDl9;)xfopA2X(B(P*glT8jcLKZb zbL8^g_-=)+-FHj<0Q~LoRm6Gp!pgsva`Ga*8YK`zCtU_bqfe#U4ES zMV#E4ZzJZ?=NLHW`wrq+T*18yma|T9?}3eX1@}H!PQQ6nu+I;WcMx+Jqfhkp5!gF0 zkJ`R_A0zt9AIM3ashs{k$FC5dp}Ob)7V(+&5pS*U5Pjss=SQ&5(R@A=b#2!B8L@^o zpO5;!Oko`RFNnWw#%NoS*7y}{9qq<>N9F#Z>wOUKit)y}I*`5b^G>XjV()|BPVdk} zcJGjOe*^6+^eHWRSBu`A(I+aw_FJ!}UjA3bajmQ#Gk#vpOF9l&w6so>~g8d%%1 zw5J`xauK%^cy)0*!)uG4b^#kJA3aS6dnRr6+`_aW+_6^mH(Ib$)Z;wM9>dfaRj6xnOh2M^A@>J(D(j z>SmX-w)gii#BWIGhl9PZ9aw!YjzGM7*3nnHd2;O9BCZFV&2tp`6eRK-4URneYB!JH z6K#=a9ypul81ybA^2`TE9(}c&$M2A~$a5?>o98%mdyhQFgCmc=+RfwlOIzeQ0c@Uc z(|Mf;mg`_T&gUe=JU$m~=ICRWH-|o_Aaa+b-|Xe;U~NhTac$PN5Hg z?Kkv6u;-57#{&2?#5jGm#~m($<8B$h7Wxn(e+lPPUxb)LK5Co}_MB0p1eVK+ch2}T z5Oe5be}3cTJi{dR3gS$+KqCK0%7@Qc=-$JuPZeGM74n?PUPFwN|ARWC?5@A*OIsb0 z^EXi(xtD;gKNX4kXM^R#XDQhFS)X&z<)i+&VB_TfqDItm|DE^8GoFWdmWhb|*>jwa z-a3a1;N;^R7lM6{vU6C5F8^9Ohvi`7@Mf9oc$t1&N+x9_a)%gIa~@SA3m3X zt)HF4<>>M;hbzFw$vcOrqQ}>)Bn-LE8#M&N+x9_YL6IIot>*A3isMt)HF4&FJz`{}!-u^3EY@xyKxC1$!1} zqkr}sx1oEEY>&62%f~tH0C%_e+=(t9&*Ltzaq`aL9(I>=&~`T>=N!b5`(AMC9PWdY z51;$N*3Zu20d)D8!-HVs9zdK!)N+qGJOuVE&PIRF;kRX&{bA%h#5?1>^z}PZX4mFB ztKTDt+$z4Zes`WoxmE0sBl^idiR2N#{pwF4V~}Zxe%f#0T^h&!G-4iothqAf;ydvS zdLI({vtWI$Oyi#e%jp;Ka^e3xSpN?Gb#A>E5YI9Lc@%jJ(Z_GG_7_u5zkivfy8kEm E58v3|z5oCK literal 0 HcmV?d00001 diff --git a/gsk/resources/vulkan/blend-clip-rounded.vert.glsl b/gsk/resources/vulkan/blend-clip-rounded.vert.glsl new file mode 100644 index 0000000000..c680c65455 --- /dev/null +++ b/gsk/resources/vulkan/blend-clip-rounded.vert.glsl @@ -0,0 +1,53 @@ +#version 420 core + +layout(location = 0) in vec4 inRect; +layout(location = 1) in vec4 inTexRect; + +layout(push_constant) uniform PushConstants { + mat4 mvp; + vec4 clip_bounds; + vec4 clip_widths; + vec4 clip_heights; +} push; + +layout(location = 0) out vec2 outPos; +layout(location = 1) out vec2 outTexCoord; +layout(location = 2) out flat vec4 outClipBounds; +layout(location = 3) out flat vec4 outClipWidths; + +out gl_PerVertex { + vec4 gl_Position; +}; + +vec2 offsets[6] = { vec2(0.0, 0.0), + vec2(1.0, 0.0), + vec2(0.0, 1.0), + vec2(0.0, 1.0), + vec2(1.0, 0.0), + vec2(1.0, 1.0) }; + +vec4 intersect(vec4 a, vec4 b) +{ + a = vec4(a.xy, a.xy + a.zw); + b = vec4(b.xy, b.xy + b.zw); + vec4 result = vec4(max(a.xy, b.xy), min(a.zw, b.zw)); + if (any (greaterThanEqual (result.xy, result.zw))) + return vec4(0.0,0.0,0.0,0.0); + return vec4(result.xy, result.zw - result.xy); +} + +void main() { + vec4 rect = intersect(inRect, push.clip_bounds); + vec2 pos = rect.xy + rect.zw * offsets[gl_VertexIndex]; + gl_Position = push.mvp * vec4 (pos, 0.0, 1.0); + + outPos = pos; + outClipBounds = push.clip_bounds; + outClipWidths = push.clip_widths; + + vec4 texrect = vec4((rect.xy - inRect.xy) / inRect.zw, + rect.zw / inRect.zw); + texrect = vec4(inTexRect.xy + inTexRect.zw * texrect.xy, + inTexRect.zw * texrect.zw); + outTexCoord = texrect.xy + texrect.zw * offsets[gl_VertexIndex]; +} diff --git a/gsk/resources/vulkan/blend-clip-rounded.vert.spv b/gsk/resources/vulkan/blend-clip-rounded.vert.spv new file mode 100644 index 0000000000000000000000000000000000000000..0c27a6b096ec10d331a5197fb9c265f3f9c57b62 GIT binary patch literal 4940 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 literal 0 HcmV?d00001 diff --git a/gsk/resources/vulkan/blend.vert.glsl b/gsk/resources/vulkan/blend.vert.glsl new file mode 100644 index 0000000000..30c1474f9c --- /dev/null +++ b/gsk/resources/vulkan/blend.vert.glsl @@ -0,0 +1,31 @@ +#version 420 core + +layout(location = 0) in vec4 inRect; +layout(location = 1) in vec4 inTexRect; + +layout(push_constant) uniform PushConstants { + mat4 mvp; + vec4 clip_bounds; + vec4 clip_widths; + vec4 clip_heights; +} push; + +layout(location = 0) out vec2 outTexCoord; + +out gl_PerVertex { + vec4 gl_Position; +}; + +vec2 offsets[6] = { vec2(0.0, 0.0), + vec2(1.0, 0.0), + vec2(0.0, 1.0), + vec2(0.0, 1.0), + vec2(1.0, 0.0), + vec2(1.0, 1.0) }; + +void main() { + vec2 pos = inRect.xy + inRect.zw * offsets[gl_VertexIndex]; + gl_Position = push.mvp * vec4 (pos, 0.0, 1.0); + + outTexCoord = inTexRect.xy + inTexRect.zw * offsets[gl_VertexIndex]; +} diff --git a/gsk/resources/vulkan/blend.vert.spv b/gsk/resources/vulkan/blend.vert.spv new file mode 100644 index 0000000000000000000000000000000000000000..dafd915f8c7eb6da168b3c6c2fe155e9717da7d4 GIT binary patch literal 1964 zcmZ9MTTc{05QQ7|0*Hc$TvWtG6fayv1w@gXXcm)ASTFH)#hrnjWSQCQ%p$(&gFnFk z;E(jh#Pjt|lZm}4y3XlS)z#HK6F=Bd!jTtmWJC`dTDob(VEv>9B zqZl$dD?~GFE?7UWzbA)52$+=JlHHd*m%WhX^y}69TS0lnlqDQV;=-0fU?bnmw)JNB!(FI|>+3~W1f)v?(!56hhbaWK^No)$*b4<7u;pc5#LHJ(j zjd0P{c-*Xg^4p1j_BQnVvo1fU81YrV-CYutx@h1TtVMB<1W{=B;G7I{&TFoA;>KPS z#>ru*Du~Tn9?i*V%jQBy|LV=4Rr?ZkLN7k&>67KZ242#D@3ZlA-SQ1TIBwX~_FRkN zTiR2TaKZLG>Lefiv%M&4dzRx4f>2cV_@8}JRl#iPRG2-;K@5hEmYT0>rVflAjBBP& zz9ZHrH228hITM)g8IB&^)Lcq2de?7w^kCi*de&z&lb`*j)&DuoyfSLUU@&%#6a^$4BrG=`py3!a&2jq_rV=)YK{G_$>{Ha6lkue96Wpl6@)LqNjHwX7um95ME0kvg{O#lD@ literal 0 HcmV?d00001 diff --git a/gsk/resources/vulkan/blit.vert.glsl b/gsk/resources/vulkan/blit.vert.glsl deleted file mode 100644 index ca78688909..0000000000 --- a/gsk/resources/vulkan/blit.vert.glsl +++ /dev/null @@ -1,22 +0,0 @@ -#version 420 core - -layout(location = 0) in vec2 inPosition; -layout(location = 1) in vec2 inTexCoord; - -layout(push_constant) uniform PushConstants { - mat4 mvp; - vec4 clip_bounds; - vec4 clip_widths; - vec4 clip_heights; -} push; - -layout(location = 0) out vec2 outTexCoord; - -out gl_PerVertex { - vec4 gl_Position; -}; - -void main() { - gl_Position = push.mvp * vec4 (inPosition, 0.0, 1.0); - outTexCoord = inTexCoord; -} diff --git a/gsk/resources/vulkan/blit.vert.spv b/gsk/resources/vulkan/blit.vert.spv deleted file mode 100644 index 5ce7a27f299d212c57410b93e25ed802715369af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1252 zcmYk4OK;Oa6orQ*P6LIOQu^Rkl7<~p#R3o#;-w0?i%1Ouu{9;Onvq=Fik(t+{0064 zKavd+=bLyePjoYL&fK~8obhx!<27Th={GP>%xY|zj<7N7rtju(@_BMpR`JpE7thGp zFkP2O&ZfEU);;}SoY@R;L$RwEDGn7~{W_Ze=s-`q;Uo%APs7Q_XjT+aS^Z3tD79G< z#deX*DtnobH)!SAY?dzLc0!>6G#&} z8JykFJYAOa<2);?v#ctG`|1GCxVS7_Eik@ksV$=K`7(>khR37hf7rO1!>_sX+?M0# zi9MgY((2hWx5XFgsYy6+cV@FjqT{&3d|7=-u8#A35j&1MwOK=%6R~(_tgj{$${!q> zPFg+!hl9q~xX!1B_o@fsw0RD{sWoF? z_?BjBt!l5{hUegYpG~dlg-`l``KEB_*s9l@Me|+FXvPowJDSk|&v`KSNu>;mPY6*4Wnrk7~}>=bowmQr{aLcw|uLuNdCP2mPb{jsid2%^PLnV_N|a zrq7-N&7X7zefMilQ^P%|Ir>he7QGJ@M9W*L1(WA> QjJ3uadw2%_lhap<|I~M6bN~PV -- 2.30.2